Back out d5d23d937ffc (bug 947429) on suspicion of breaking gaia-ui-test