(cherry picked from commit 5833c707259247338c27b1a75a175c5aba925c29) Signed-off-by: Joshua Boniface <joshua@boniface.me>