Change verbose builder out back to attach Upstream-commit: e345fe53ba1e8f84cef2396e332860a87fcd65da Component: engine