I forgot to mention in the previous message that I backed up the repository right before doing the import. I'm going to extract that backup overtop the current repository (again, with a backup). This will un-do any commit you have done in the past hour and a half, or so (other than CMake changes). -Brad