Revert "temporarily comment @Override to fix compilation problem."

This reverts commit 8ada505b9e5b31292df720c3daa3736963dec80e.