Looks like that PR was merged, do we still need this?