Revert "PerformanceControl: bugfixes"

This reverts commit d8471db18f75a2c10184b3485f3e705b240f8b9c.