Signed-off-by: Chris Nauroth <cnauroth@apache.org> (cherry picked from commit b9eb760ed238a2ae57a0dbb8b7e95f54589325f2)