backing out SWC-715 to fix submissions