Bug 948326 - Actually address review comments in bug 918135 r=cpearce