Fix broken refactor in aa0ea7160c1480ef9ad1a125006a5ecd9cc43b60