Roll-back of Issue #534594 by beejeebus, catch: This causes fatal errors from class loaders in certain modules (CTools, etc.)