Refactor #9969 appeal to the module only through GET