Previous change broke angles badly *and* was a voodoo hack.