Cleaned-up useless if() (refs #1839)
Merge pull request #657 from eguaj/3.2-A1839

Cleaned-up useless if() (refs #1839)