Issue #2810985 by _Archy_, smustgrave, GoZ, joelpittet, csheltonlcm, ayush.khare, Lendude: Remove duplicate condition
mentioned in commit 0f5cb793
mentioned in commit fee84369