This reverts commit 84cbd71c95923f9912512f3051c6ab548a99e016. This commit breaks one of the internal tests. As agreed with Alexey I will provide the reproducer later.