Revert f358903..0c61ef8

This rolls back to commit f358903260738e306cc38ed7688dc31afe95d0ae.
wat 2