Bug 568953 - Fix for regression introduced by 82c3097bb8b3 CLOSED TREE; r=me