Revert "[4.9]"

This reverts commit c5797a4456af8841bedf7a067a38fe2f86dfc9d3.