Comment 16 for bug 1270261

Commit 81e3969103a4b2fc705322bd9afee4e415934f80 is indeed responsible for this regression.