CMK 2.1 - "Activating changes" significantly slower than in all previous releases

Activation time was between 60 an 90 seconds on my site. 2000 hosts, 53000 Services.
I had to disable all of my 52 active_checks[“bi_aggr”] aka “Check state of BI Aggregation”.
About 10 BI Aggregation checks were constantly timing out after 60 seconds.
cmc process had 100% CPU usage (or more). WebUI was unresponsive.
According to log files i got the impression that a lot of time was waisted for waiting for locks on /omd/sites/mysite/var/check_mk/core/config.pb
Activation time is now down to 32 seconds. Just like in Version 2.0.
I have not changed anything regarding the password store configuration. Still using it. “Check state of BI Aggregation” in combination with config.pb seems to be the problem.

How do i disable config.pb? Is there a way to downgrade to version 2.0?