I complained about this very problem months ago.  Tejun Heo responded
with the attached patch which does indeed fix the problem for me.
Unfortunately, this patch hasn't made it into the kernel yet.  I have no
idea why.