Back out 1b87e7511983 (bug 940954) on suspicion of causing b2g desktop Mac sqlite troubles
CLOSED TREE