This reverts commit 39d18dc4 which
was commit 60cefed4 upstream.

This was not needed and is not suitable for 3.2.y.
Reported-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>