Revert "Fix for GRAILS-9880"

This reverts commit 926f81107e679345e5721a51162bab5e259868e6.