Revert "Moto-X patch - credit kszaq"

This reverts commit c4bd3f675de9692af2f14b7635f87cae43751603.