Revert "Merge commit 'c8dc1ba69d2f8edbf6a759b359303ee1c5d5a6f0' into kitkat"

This reverts commit 35d8156218ba73078b6b7f3d379197414aa98056, reversing
changes made to f0f904d6823efb5e72a3e955e68ad5144f65f817.