Revert "Merge pull request #166 from subugoe/piwik"

This reverts commit c1bbbfdc9981a01bb493202444485c2c60c2ace4, reversing
changes made to f7d172f91528bb8b81380116f70a6c8575857152.