Back out 9bfca2900825 (bug 694254) for incompetent review
Bug 759585 - Zones (r=jonco,bhackett,njn,dvander,luke,bz,mccr8,bholley)