Warning: Do not backport the fix for this bug to 0.6 until the regression bug 1353867 that it causes is also fixed.
Warning: Do not backport the fix for this bug to 0.6 until the regression bug 1353867 that it causes is also fixed.