This closes #5947

Signed-off-by: David Handermann <exceptionfactory@apache.org>