I don't recall if I reverted that commit in a Trusty test kernel or in Xenial, so you may be correct. A merge after 3.13 may re-introduce the logic added by that commit. We can investigate further for the newer kernels if we find reverting d215f91 in Trusty works.
I built a Trusty test kernel with commit d215f91 reverted. The test kernel can be downloaded from:
http:// kernel. ubuntu. com/~jsalisbury /lp1470250/ d215f91- reverted/ trusty
I don't recall if I reverted that commit in a Trusty test kernel or in Xenial, so you may be correct. A merge after 3.13 may re-introduce the logic added by that commit. We can investigate further for the newer kernels if we find reverting d215f91 in Trusty works.