Merge "UM only: change zed to use unmaintained/"