Revert "Improve build artifact filenames"

This reverts commit 569f957ca9d68db20c3b1fca141b0788b42c50c8.