Roll back because of https://code.google.com/p/android/issues/detail?id=201951
Roll back because of https://code.google.com/p/android/issues/detail?id=201951

martindisch/Kantidroid,martindisch/Kantidroid