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