Revert "fax from last cherry-pick"

This reverts commit dbf12251872a7d146e516ea2f46ecd5792426c87.
Revert "Linux 3.4.79"

This reverts commit 1653668858da707f4dbaf38e3681ee19717e9c2f.