Backout 6be5ab4c2fde (bug 829580) to see if it fixes bug 829690