Bug 880330 - Remove the old options API; r=bholley