Revert "0.7 vanilla"

This reverts commit 66bf234a854d01e1009cc5d2dae857f4ab42d4b3.