Reverted boolean change - nil is fine