Refs #2633 - revert previous commits since they are temporary solution (final patch in the works by Timo)

git-svn-id: http://dev.piwik.org/svn/trunk@5129 59fd770c-687e-43c8-a1e3-f5a4ff64c105