Merge "Revert "More general store elimination""