Comment 8 for bug 1915464

Thanks, Terran, Stephanie, and Michele. Pushed to rel_3_12 and main, along with a lil follow-up to use spaces rather than tabs, and remove an extra comma.