Revert 4d2d71c..d0b0191

This rolls back to commit 4d2d71c2eed8c300fb0d97cdb787b793e0499f41.