Now that I think about it, this block wasn't in 2.4, so perhaps we should delete it while it's not too late... but that can wait for another PR.