This reverts commit 43a569fa. Unhelpfully, the tool just added the header and didn't actually update any of the tests. I didn't notice until after pushing.
