Comment 2 for bug 1895660

Also take note of the first commit: this is broken up by file for simpler review, I would hope there aren't 9 or more individual file commits if / when these go in.