Revert "Merge remote-tracking branch 'carbon/kk' into kitkat"

This reverts commit 85d2487709c47897bdd86f5962136bbf41c2f51b, reversing
changes made to 5e436324b1e8febd5adea5231e8be7b872257318.