Revert "Temporary change for VF-5666"

This reverts commit e96c391f34c43ba0918ba8e82306b1ef211a7ba2.