Revert 09b679c..b7ca430

This rolls back to commit 09b679cb76e8933f4fce25f510baf30d898b0bce.