This reverts commit e13b7062


since it seems to cause problems with the init-repository script.

Change-Id: Ie8a038041b3a17dcb0bb1f629285205a328a6819
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>