Compatibility regression fix for previous commit.