Bring back some missed code from the original merge.