I was just looking at the diff, it looks like the duplicate lines were added in this commit, can we back them out? We don't need to wait for CI but no point in introducing the duplicate code