Revert 3fec843..cb71d44

This rolls back to commit 3fec843363d0c076e13cfdd73f30c80d40e3dec5.