Fix some overkill in previous commit.