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