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