Fix for #5168 (cherry picked from commit 64730b5661) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
64730b5661