Revert 8e6f5d3..84f85b3

This rolls back to commit 8e6f5d3e89264cc214636bce7a7cf24700a35e06.