Revert "Version 1.7 WIP Update 2"

This reverts commit 8a1ab789fc2a4281acde8ad1c8fd9440b077e9a2.