This reverts commit d2c11324. The reason is that some user testing suggests that this change is what introduced the sporadic hangs some users sometimes see.