Revert "Merge branch 'docufix'"

This reverts commit ee6ed78326ee435333d4ea26dbc9fa4287e070c5, reversing
changes made to 0bf3cd1d485ed28ff0ba8a519df7fd6493dc2ee7.