revert CRM-11304 This patch has caused WSOD