CRM-12930, reverting commits associated with this issue