Revert "Prefer maintainer field instead of Maintainer comment"
The change to use maintainer field instead of maintainer comment caused some confusion, and was introduced in the wrong way. Revert for now and follow up after 3.21 release.
@sertonix ok with you that we deal with this after 3.21?