Turned remove_empties option back on.