QA-3899: Revert temp fix as it's not needed on 1_x branch