Backout ec5df8e5a755 (bug 831123) for breaking M8 on Android