Merge "Revert "Revert "Change condition to opposite if lhs is constant"""