Revert "sync kumquat"

This reverts commit 96fd3bfe2f466477263596929bd2fa56819d4e2b.