Revert "less fuss"

This reverts commit 2f943b1425629d2f1395bab9b03e1fcbfa57888e.
Revert "Track PerformanceControl"

This reverts commit cd971b1ccb1a45145f83348de8973217da3e5829.