Revert 65a6e31..f0013e2

This rolls back to commit 65a6e31afcf3853eefb58459b02450dc9ef44e61.