Sorry, I never solved it. We eventually replaced it with a 6.1.3 install (for test coverage), so it was basically the "nuke and start over" workaround that I wanted to avoid.
