Hello Jon!
I had the same problem you did so I decided to look into the code and see if I could do something to correct the problem. I left a patch proposal that I believe can help you 
(and hopefully others as well).
For your reference (but mostly for anybody else that might not be in context) I'm talking about bug MDL- 7939 and the proposed patch is here and the suggested instructions are here.
I'm not any sort of Moodle expert but I tested the patch quite thoroughly and I believe in it enough to leave it deployed on the university campus server that I currently manage 
Best regards,
André