This was done in a branch pre-rebase. The branch didn't rebase cleanly. This was from a manual merge. More manual (and automated) testing would be helpful.
