Revert "WIP DO NOT COMMIT"

This reverts commit 7982b98125ed54d1f56242bf5fb4821bc919d5e9.