Commented-out source-level=1.6 @Override annotations so that Eclipse can compile with source-level=1.5 (FIXED BACKPORT ERROR BY RESTORING CONTENTS OF FILE)