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