Is this also a candidate for this PR?