This reverts commit 3e21fb616d. A lot of integration tests are failing on the bot.
3e21fb616d
func
func.func