Yes, if you like, let's open an issue and make this defer to the new SCM stuff that we got in #828  ?