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