Revert "separate conditions"

This reverts commit 77344d9671c155a090dae153df798c968b94eafe.