Further vanguard tweaks that drop the root from 2.5 to 1.8 (#5215)

Further vanguard tweaks that drop the root from 2.5 to 1.8 (#5215) #3368