CRM-12144 revert changes to prevent regression (keep the gremlins you kn...

...ow