Reverts changes made in 43e45aa9.

That don't actually solve the problem raised in #130.