Fixing snarled merge

This reverts commit e81332d197a1df02e4de8c3f32e18c6bfa1968eb, reversing
changes made to cf7b4b6c85ce768ecf54e2f3b48f367c4106130b.

This should leave your repo in the state you wanted it for the PR.