Bug 455983 - Error introduced by commit f6cfb9cb11b0a02fa24e4548faa78fcd0268a4f7