Comment 3 for bug 1670407

I have tested this and it works fine. It is pushed to master through 2.11. Thanks, Bill!

However, Bill and I also talked this over briefly at the conference, and agreed that this code now has a belt, suspenders, and a rope tied around its waist. Probably time for some new pants! As such, I am going to open and work on a follow-up bug to refactor this particular area of the code to be a little more sensible and less duplicative.