This regresses a recent fix. We should remove this change from the PR.