Amend f70204f2 to facilitate merges.
2 files changed