Fix work-around logic in previous commit.