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