Revert back to JSR-330 annotations