Go back to non-SRU format per bdmurray's suggestion

This reverts commit add4210761e4c78fe98d6b69396c312c44531136.