Merge "Ensure we have the correct thread when allocating obsolete methods."