Issue #2344367 follow: Putting back lines that were removed following a bad rebase