I'm not sure whether this actually fixes the problem described in the bug, but it fixes the issue I ran into when I tried to reproduce it. Hopefully this will end up being a fix for the larger problem.