ENYO-2263: reverse the previous commit