Reverted previous change to cond/case