Revert to before sparsity was added

Sparsity things are mucking things up