Revert 85f22aa..f4e81f4

This rolls back to commit 85f22aaf273855d465b336ff0d3077496db18b2f.