Revert "comite20141116-19:02"

This reverts commit fb5305d9487ce63aeaf82feea2ac3e4c77e4be17.