Merge pull request #1028 from apple/revert-976-anyobject-mangling-revert-4.0

Reapply "Update for AnyObject nukage"