Revert "This was added to the wrong place"

This reverts commit 63d1193fd2726aa5b1353887f12acd111e194b34.
Revert "Merge in latest from the official repository"

This reverts commit 43cf540cb11db60103957538ac4cd09d1dced7e6.