(cherry picked from commit 75216182c9a04741b2f773eb2f26ceb7a96bfbba) (cherry picked from commit 2a55ab13ef9c735a16674006a518c0e5acf7c88f) Co-authored-by: Sam Atkins <atkinssj@serenityos.org>