Merge "Remove spurious duplicate line of code"