Revert 8cadff2..3d6da9a

This rolls back to commit 8cadff28e13c2c3279389505acaa995de02e4b9a.