Original commit from prior source.