Fix #9132, but in the correct branch

People, don't PR against `gh-pages` please!