DO NOT MERGE until we're ready to break existing clients (1.13.x) that attempt to create these artifacts when importing binary packages.
The final stage of #1172.
Fixes: #1172