[Truffle] - Reverting last commit related to truffle.

Reverting commit be570b4488642 because this wasn't a good solution to
make the class specs pass. Also it broken the build.