Revert "Merge remote-tracking branch 'origin/kk44x-test' into kk44"

This reverts commit 7bdae251ec3d044a90feb656f988f7713865a049, reversing
changes made to b4ecaf7c20fb7a1b29712d2a11fd4f49fb1baf31.