Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 1052578dadf72e400cee5ad2ad5dce899032d362)