Revert "Very probably the fix"

This reverts commit c427fcbd80ecf52f401164a7e7745c9abb4dedc0.
FG Dev Stable 19-11-2014