Bug 869836 - Fix bustage on Windows due to rebases. r=me