Fix 1.8.7 breakage from a previous commit.