Both functions remain broken regardless.
Reported-by: Yann Le Hir <yann.lehir@gmail.com>
(cherry picked from commit 5458760b3fb59051cfd622c19898fbe63cafc79a)