Revert "Updates for new Piwik version"

This reverts commit 1c960a4b626d82f21b35aca8d08b19d67dba1e15.