Getting rid of toApiHash call.