Revert bc31b4c..6232aea

This rolls back to commit bc31b4c59cf250d91f903bc70226fb4d7963c617.