Linux 3.4.6 (reverted from commit 9e3a5824a58465d778ab6309e01fcd3ee453b4c0)