In this MR we provide a hotfix for T330688 so that we can unblock the pipeline to continue doing its thing while we come up with an automatic way that works.
We also revert the previous solution that didn't work out.
Bug: T330688