This reverts commit 4f5890a0fb. 9ef1127008 is a proper fix for the problem we tried to address. Sponsored by: Instituto de Pesquisas Eldorado (eldorado.org.br)
4f5890a0fb
9ef1127008