[#86030] Refactor to use #inject