does this need a rebase? I removed this in another recent commit.