Revert 9b18b2c..4f543b1

This rolls back to commit 9b18b2c4c206f3328fd09fd19be1011e2f7202a3.