This reverts commit 81331211.

This revert was requested by the author of the patch as it seems
to cause system hangs with some low frequency events