Revert 57f264c..8efba33

This rolls back to commit 57f264c81d2a6782ecae756f7b3ae5eedee76b09.