Revert 2e6e996..11a991b

This rolls back to commit 2e6e9965703a141392d3a18b78c23c7dbffdccd2.