Revert "Change method names for fallback and extra stuff to deal with seoables"

This reverts commit b398483139d2ae0681200975d848d76057b2dc56.