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