b86829f492
This reverts commit 86c40f84741c184123f6e96c87d932e4804e7add. Reason: new issues were discovered during the g3sync. @vsavkin is working on fixing them.