Comment 3 for bug 1432762

- just writing to confirm that reverting rev 7691 does indeed fix this bug.
- the same change also fixes Bug 1354339 as well, details given at that bug report comment 8

- any objections if I proceed with this change, any comments?