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