Revert 6bd05c8..0e8d917

This rolls back to commit 6bd05c8a31daf52aaa78ed5b322c1c0ace430490.