Revert "Various implementation and stability patches"

Reverts Zentyal/openchange#55