Revert "condition improvements"

This reverts commit b9b0b0bf18c4d1a013f57ee90fde6c856d3b6b68.