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