Redo MP6 fix as auto-merge had undone it