Bug 912090 - Restore patches that weren't suppose to be merged