Remove no-op if statement
Merge pull request #16924 from holmboe/noop-if

Remove no-op if statement