Revert 9114de6..f112995

This rolls back to commit 9114de691518c654a5295a3e05227f36b4a0857d.