MFH: r370228

Fix packaging