Revert "Fix for GRAILS-10403"

This reverts commit 653d6174b66f2a83a75918f1a8123c749f98f0f7.