Sync with latest upstream, remove utils header usage