Revert "Update from Macpro"

This reverts commit 1df06cc70e50323976764b49985e6dca106cbec4.