Revert ordering, to fix dependency installation, while keeping the changed notification calls.