imap: Finishing previous commit by removing now-unnecessary code.
imap: Finishing previous commit by removing now-unnecessary code.

dscho/dovecot,dscho/dovecot,dscho/dovecot,dscho/dovecot,dscho/dovecot