This reverts commit 92f56ab692. This has broken kubemark test. Let's revert this change, debug offline and fix.
92f56ab692