bug#454, commit e1db360d was lost