Bug 1047128 and bug 1042415