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