Follow-up to r114256: Removing final assert