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