Revert to old OSG, gave up trying to make the new one work