This reverts commit a6f0d0cb52.
a6f0d0cb52
Reviewer: Hugo Parente Lima <hugo.pl@gmail.com> Marcelo Lira <marcelo.lira@openbossa.org>