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