Signed-off-by: Sean Busbey <busbey@apache.org> (cherry picked from commit 577db5d7e50c56b4773c9ce92b807aae80bf5706)