Comment 9 for bug 1391675

Applied in 1831114, thanks!