Revert 69769d2..e828655

This rolls back to commit 69769d20218f6e489c52e679733a1947d0fa205e.