fix broken backport :bomb:

The backport should have had these changes for 3.2.  Here they are now,
yay.