Revert "Dammit still not ready yet"

This reverts commit 007a8573f04a42848bfab841343f7c5c6c8a5d20.