Comment 23 for bug 1659181

Thank you Kyle! It works for me.

I still see some of the feedback issues I mentioned in comment #16, but I'll file new bugs to addressed those. I signed off on your commit and merged it to master and 3.0. There was a conflict that I wasn't comfortable resolving for 2.12, so I didn't go any further than 3.0