Revert "WIP DO NOT SYNC!!!"

This reverts commit dfccebab5b5b470a3620cdf76a697bbe1483ec08.