Revert spacecaker changes!

This reverts commit 20b6ad498a3423fe6bcfb50ff3d251d1cd8755b6.