CLC-3215 Revert earlier commits - still one redirect hole unfilled