Revert 4852289..16d57d6

This rolls back to commit 4852289e5e56da8153cff0a985d5022536c3159a.