Another forgotten merge conflict from tag 3.4.12