was lost). Restore original version to try and avoid breaking the build while David O'brien does a proper set of imports and merges. Requested by: obrien