Restore old behavior for if(...)

Manual pull of 4c389d44