Revert 883b16c..2c300d1

This rolls back to commit 883b16cea9f38410c121fc988d4aee6ced3832b3.