Revert second attempt as it does not help :(