Fix fallout from bug 617532 r=bustage
CLOSED TREE