[ci skip] Clean-up following PR #2864