Uncomment @Override as AHC targets JDK6