Merge changes made in Prod back in repo.

I copied the changed made by hand back to the Git repo.

I will not do this again.