Comment 3 for bug 1095249

I will report it as a separate bug; as you mentioned we may need to audit other locations of its usage.