Fix yet another build error on 3.12.1