Revert "Merge branch 'master' into ignore-missing-exclude"

This reverts commit 2479cf162ec95d733bfd179a77ca96e7ddd8ecd2, reversing
changes made to 7439a3e7fabca8c30f799e8f5c2c7ec48abb0bca.