RF-13572: reverting the previous commit - the issue was fixed in Warp snapshots