Follow up PR to fix packaging failure of #329