Revert 35f2f7b..bd99dee

This rolls back to commit 35f2f7b898502bbb20f7722bdadec43650ae771e.