I think we can go ahead and remove this since SPR-11028 is resolved.