Revert "Readd previous condition"

This reverts commit 5268d6b9bec0856e1c0b12d051e458d08d7764a1.