Fix third party integration (cherry picked from commit 7a988ef77d) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
7a988ef77d