Revert "[3.0] Updates after removal of experimental API"

No match.