Trying to fix regression by previous commit.