This reverts commit 86dbcafd. Reverting since this depends on db288184 which broke our lto builders reported by fxbug.dev/12380.