Resolve a merging PITA by brute force

Committing the current version of these files from Production into Ethan
because I kept getting hung up on Merge Conflict.