Revert "CRM-13571"

This reverts commit e3ef307a2f84055ee4115f998f9a8be98064fe49.