Revert 6867f1c..6f9ac90

This rolls back to commit 6867f1c762d6c88433c4647ef6bb1dcb93dec3d5.