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

This reverts commit 6821c2c15a5075e288935a3e8b5c97064bdf6632, reversing
changes made to 733ca26832f2b67b78464db1316588e53a7366b0.