Revert 122341. It breaks some darwin tests.