Merge "Revert "Revert "Revert "Revert "Basic obsolete methods support"""""