This reverts commit 947fc9f044.
947fc9f044
git-subtree-dir: settings git-subtree-mainline: c26f7b390a git-subtree-split: 230545a4a7
c26f7b390a
230545a4a7