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