Backed out changeset eaac19489aa6 Bao agreed with my initial version after all.
Backed out changeset eaac19489aa6
Bao agreed with my initial version after all.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm