MFH: r371191

Fix packaging