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