Reverted changes for grails 2.2.x, just to isolate them in an appropriate branch until they work