Revert "Merge branch 'master' into autotools"

This reverts commit 47eb1249c640fe934f1f2a747db90eb26ea1c44f, reversing
changes made to 43b299a258f1fee3138253c9b9a2d184109917a0.