I'm not entirely sure about this - it wasn't working, though, and this appears to make clearing uploaded events work, so maybe it's right? The troubling thing is that this doesn't change the behavior of the tests, so... I don't really know what to do.