Filed as cleanup in #3471