This reverts commit b253c9d1. It's still
causing problems on some systems.
Signed-off-by: NMatthew Garrett <matthew.garrett@nebula.com>