This reverts commit 0dcd790a. Oops, the fixup commit caused `arc land` to override the previous change of authorship. Will fix in a moment.