Revert "Revert "Update to SpaceControl.""

This reverts commit 27e765bc86de29ce5c1ca42bc4a0430a7d24a804.