This fixes all cases that previous code has with no changes... sorry pancake. --HG-- extra : convert_revision : 993d0aa060daf36d1b5ffa63725002dda122c091
--HG-- extra : convert_revision : 0bc55ebae04b2e1e5ab20feca786b649fc2e0335