Comment 3 for bug 1737750

Note that I've compile tested the attached fix but don't have hardware to do run-time testing.