BABIEL-67: rollback change as the issue still appears