Revert "Upd to v1.30.87"

Merged Stefano Capitani requested to merge revert-3b5866b7 into master

This reverts commit 3b5866b7

Merge request reports