Revert "Moved things for 1.7.2"

This reverts commit d8e32213ce0b2344e09cba947d106bc18c9138b1.