Bug 1020134 revert