This reverts commit 2128bada. Giving false positive in master branch - no idea why and cannot debug it