revert change related to GRAILS-9749
fix failing tests