Restored bug fix that was clobbered by a merge.