This is not used currently, but needed for work done in id-remap branch, and will greatly reduce diff noise in this area...