(1) In section 85(c) of the Principal Act, for "section 84(5) or (7)" substitute "section 84 or 84D".
(2) In section 86 of the Principal Act—
(a) in subsection (8), for "section 84(7)" substitute "section 84";
(b) in subsection (8A), for "section 84(5)" substitute "section 84D";
(c) in subsection (9)—
(i) for "section 84(4), (5) or (7)" substitute "section 84, 84C or 84D";
(ii) for "section 84" substitute "Subdivision 1";
(d) in subsection (9A)—
(i) for "section 84(4), 84(5) or 84(7)" substitute "section 84, 84C or 84D";
(ii) for "section 84" substitute "Subdivision 1".
(3) Section 90A(2) of the Principal Act is repealed .
(4) In sections 90B(5) and 90C(2) of the Principal Act, for "section 84(4), (5), (6) or (7)" substitute "section 84, 84C or 84D".