Revert "Add missing @Override annotations"

This reverts commit c1e6dcb8c885da0cea320d0a6f44e0a36ed87aab.