CLC-3215 Revert earlier commits - still one redirect hole unfilled
Merge pull request #2167 from raydavis/raywip

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