fc1f61ef5f
independently by Robert, but also proposed in the PR below). PR: 38126 Submitted by: Josh Elsasser <jre@vineyard.net> MFC after: 1 month