Revert "Fix crash on start from 11.2"

This reverts commit 0bdc710cc69511dd000c8196725b4effeb3583f4.