Bug 947045 - Fix breakage from bug 950235 (rs=evilpie)