Revert "Merge remote-tracking branch 'upstream/master' into gtk3prep"

This reverts commit 6208ce27c93e9a9968c661ab4ae24b58b3322803, reversing
changes made to c8b97271cc27849b33372709fd8908ac388d17b3.