Use patches from comment 6 for bug 1027354