Reapplying // fix to files that were undone by merging

17 jobs for stop-the-madness in 8 minutes and 8 seconds (queued for 3 seconds)