Merge "Revert GetThisObject change."