Revert to nonSimpl version