Revert 57f6b29..4733c96

This rolls back to commit 57f6b29318a1f7e1926e9dd6487fc6b4ad95c68a.