Merge "Ensure invoking obsolete methods throws errors."