Comment 5 for bug 1188647

Seems this is not working well in 3.10 either where it also applies to more systems as well. Pull this change up to the v3.10. Note we are not as yet applying it to 3.11 based kernels to allow testing there.