Revert 76b2ca1..8612ea9

This rolls back to commit 76b2ca1d22e5a6913dd0d0082d1338d31ede27e4.