Signed-off-by: Jesse Yates <jyates@apache.org> (cherry picked from commit 0ff4f5fba9cef8b4dea599357d935b47f6151152)