Add the fix that should've accompanied r213738.