Revert "Merge remote-tracking branch 'upstream/kitkat' into kitkat"

This reverts commit 3fc04d29f4c539d993b100e1563db08faa786b05, reversing
changes made to 6284ae6e61f510e2c4aca6509121f4a9e12fc407.