Follow-up to #16935: Remove left-over require