Revert 2f9f57e..37d0e0b

This rolls back to commit 2f9f57ed1e582decc631e341a5aa232a96aa2e54.