Revert "TEMP FIX for Wylker, will be rolled back for matured changes in v6"

This reverts commit 0b861f71af167ee813f8602125f4ec4af128ee3c.