Fix monkey patch that brakes validation in the CMS