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