Revert 9834408..969e6c1

This rolls back to commit 98344085a11db83c35c09a7a893fec099d60114e.