Locked in the tedivm/dovecottesting version