Should apply to latest git tree.