This reverts commit 6b0011c8f1. It caused a major performance penalty in unit test time on macOS (about 30 minutes).
6b0011c8f1