Revert "Condition optimization"

This reverts commit ab3809ee4d2c6647ea2d9ae723056925d929ef59.