Revert "Merge remote-tracking branch 'PA/kitkat' into kitkat-staging"

This reverts commit 61c139368bae8dc3ad4d11bc18146909790b6474, reversing
changes made to cd9836312e519ed8aa06e049014787b02398f25e.