Other parts of the tree are hitting the same issue as arm64 did. Bring back the workaround until they all get fixed up.
See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html