Bug 832041 - Followup addressing review comments that was accidentally left out. r=me
Bug 832041 - Actually push code for the followup. r=doh