Merge "Revert "Refactor annotation code for obsolete methods.""