revert part of the commit from pull request that caused failing test
Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x