Clean up mishaps arising from multiple folks trying to fix the same problem. This version matches the trunk.