Backed out changeset c0e333b0f7dc (bug 866528) on the suspicion that it has broken gaia unit tests again