More generally, it looks like we have to resolve our future 2/3 compatibility path before I can accept or reject this PR; it assumes the single-codebase approach.