GRAILS-10835 - temporarily revert the recent changes
GRAILS-10835 - improve resource mapping constraint handling