Revert "For now it causes build crash"

This reverts commit f5258588ca659154d88226a552033c66f1052271.