Revert "Trying to hack the broken conditionals"

This reverts commit f1d1308984828ef856c9f9c5f9c4a2facfc6f7f9.