This reverts commit 51abc0cc8691daecd7cec8372e4988e9f3f1913c.

Tested on x86_64-pc-linux-gnu, committed on trunk