Pushed to upstream

cc/ @tinatian.  Reverting as this commit is breaking FTL resolution process