Revert two files changed for debugging.
Fix test by re-introducing @Override.