Signed-off-by: Josh Elser <elserj@apache.org> (cherry picked from commit 5784a09fff10f5ce927d489559331345ff9045f5)