Refs #4768 Revert this change as it does not work perfect yet.
Merge branch 'master' of github.com:piwik/piwik