Backout 3c0d710561bf (bug 927363) due to causing bug 930296.
Backout dc03ef5cd3fd
Backout 6d33ac3a2b14
Backout 2baeee8eb114
Backout 3903cb4b779f
Backout 87b5e35236ef (bug 931746) breaks UI tests