Revert "Merge branch 'cherry-pick-5d4f74de' into 'master'"

This commit was brought to my attention in that it could make an exact match fail.

I think it needs a few more eyeballs on it, so I'm bringing it up as a possible revert.