Revert "v0.9 almost production"

This reverts commit c0893402f3bb69f3b3ef75536cfa00e2a83acc82.