[WIP] Backup copy in case #529 bug is not fixed before launch.

** Do NOT merge **. This is a backup, a plan B, in case #529 is not resolved by 4PM Central today.