Revert "Merge branch 'zentyal' into saucy"

This reverts commit 672877e4429f1d3c326228875e3d4140210da8b2, reversing
changes made to 8c91a8726174bae6e6b32d58ad20befa184f66e0.