Comment 2 for bug 1496837

Pushed to master, and though I wasn't sure about the need to backport, went ahead and sent it back through the active release branches.

Thanks, Mike!