Revert 906a1eb..74ab966

This rolls back to commit 906a1ebb6c7180bef094e417cfa172cb7b95ce35.