Re-introduced @Override annotations. This should require a Java 1.6 based build, which will be activated with the next commit.