This seemed like it should be easy, but apparently there are a lot of gotchas that need to be ironed out in a branch first.