This is a pre-fork change before spinning off another project based on this code to create a more common codebase for sharing patches between projects.