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