Revert "This caused crash in build - to recheck later"

This reverts commit df749bf41784a2e19e4e37f627ec3b31cc3e2e6d.