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