contrib/package: revert r6919