Hmm. This is inherited from my merge with  d884180 of #1742. Do I fix it, or do I remove the file from the changeset?