Merge "Revert "Work around preopt causing test failure.""