remove cruft
convert to Milla
Merge branch 'milla'
fix test
Switch to MakeMaker (partially due to RT #84171)
0.9022