This reverts commit 7bdf6917. I believe c4545110 should fix this. I have verified this doesn't happen with just this commit.