Revert "Patch 2"

Reverts armukul/km-support#1