TEMP: Don't remove 'zone.' prefix