Refactor #9705 to respect super