Unbreak package building caused by #955