Revert incorrect merging of debug-early branch.