Revert "Merge pull request #42 from gpsantos/GRAILS-11670"

This reverts commit c0ad1374a04620b09b74853b484aeef6cf42b209, reversing
changes made to 1d2c066841ba84d6112cbc76c9109af7a94fd170.