Moto-X patch - credit kszaq