Partial revert of 6a1cd0494908330b9343fea42ea0b16199b68944 following piwik-hackers feedback