revert srs commit from this branch