Here's a one-off script for #1936

@BastianBerndsen and I are going to run this once to fix #1936. We could use this as a base to properly implement #900, but that'll take a good bit more work.