Revert "Add @override on default groovy methods"

This reverts commit 11f63fdd1c3bda08200ffbd623691bd08ddb84a0.