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