Remove workaround to ENTESB-2081 because next product buikd will contain proper fix