Revert "Work around Groovy compiler bug that can name classes incorrectly"

This reverts commit 46fc5c05e32b757c0d95eb13d4a592aa06593af3.

Closes #598