Bug 979816 - Backout bug 977701 because of a Talos regression

Landed on a CLOSED TREE