Revert 657c6fb..1c2dea9

This rolls back to commit 657c6fb31ed5da5f6e9634143c87467a0e05d6e0.
Stable level2 prototype