Partially revert 161f2203: re-add canonical versions of some files.