* Revert "Reverting package changes until I can figure out how to fix Windows. (#14007)" This reverts commit 6fda8ee821dd2e63e7949e57b10efde84bb0a3cc. * Make prepare_package run on Windows