Restore change lost in f8cc382db