Rewrite for Zentyal 3.5