patches for bug 1074612