Fix sprite ordered collection
Revert some sprite changes