VE-369: Fix by partially reverting b6a83a2f39d930a1d645397d6a1c3a8702a54776