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