Revert "Merge branch 'KC'"

This reverts commit 12d5d3af2d7405dc40e160565ce5368f2ae3b92c, reversing
changes made to 44cd56d58183b6e16beb7aa288167ac6eeaf6a26.