It's no longer needed since last commit, and since it's new in 2.10, we might as well remove it. This reverts the rest of 768d0661.