Backout bug 506815 (7c97034feb78), for causing bug 1085027. r=backout
merge