Currently needed for R2 support. It can be removed when the move to NGW is complete.