Fix regression
Revert changes, !count -> empty()
No need for array_values