reverted changes intended for dovecot2 on debian (not dovecot1)