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