Merge "Only try disabling quiet mode" into nyc-dev