Merge "Revert "Basic obsolete methods support""