This reverts commit 13f95cc3d10d9884acd2dbfc112e3c7079403c0a. The commit makes some polly tests failing