Replaces mailman/mailman!801 which was merged without squashing commits and without a good commit message.