Comment 5 for bug 1508115

I probably don't have time to work on this in the next few days - I started a functional test and poked at the code leading to the above analysis - I'll push the WIP test then unassign myself in case anyone else has bandwidth to pick this up.