Oof. This is my biggest concern with this PR currently. /cc @rodjek