Revert "HEAD is now at acf1fa5 Merge remote-tracking branch 'gnu/master' into 4.9.0"

This reverts commit afbb9377f85ecc3a34ae4b3e39be39d2a9023553.