Reopening of #9598

This was to un-stuck bors (hopefully)