Revert "Can't reliably reproduce this bug"

This reverts commit 55d2a1d6aaffeb5f796989382a6ec7e825737436.
Heisenbug: http://en.wikipedia.org/wiki/Heisenbug

Really just trying to work around an incredibly annoying bug that only
seems to crop up once in a while.