Co-authored-by: Chad A Simmons <chad.simmons@member.fsf.org> (cherry picked from commit 848c03f16ab25ff193ea9ed7e4b21e99c6fb3fa0)