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