Undo upstream fix until next FE merge.