Thanks for checking, Victor.  Don't feel bad about your results, nor about not checking sooner. :)  We'll get this sorted out.

For now I'll revert.  This is not code that changes very often, so there isn't much benefit to keeping it merged.  Testing against a separate branch is just as easy.

Could you point me at an immage for that VM or instructions on how to reproduce it?  I hate having to bother you to test my changes! :)