Fix orange introduced by c4ace0f3ee89 (bug 834302). r=orange.
Bug 833935 - Stop using one static var per compilation unit. r=jdm