backing out SWC-715 to fix submissions
Merge pull request #488 from jay-hodgson/release-7

backing out SWC-715 to fix submissions