Merge "Revert "Remove dead code from compiler driver.""