CRM-11304 reversal due to WSOD