This reverts commit 6102310d. It appears to cause compilation non-determinism and caused stage3 mismatches.