Revert 74723c7..fc0b4d9

This rolls back to commit 74723c7b1b48d83b6d6e05660c1807f493e7192f.