Revert "More general store elimination"

bug: 35745320

Got a few failures:
bug: 72440777
bug: 72480435

This reverts commit aec4e73779e5034b6f84032a1649023c1333bad2.

Change-Id: I32f0a80a590c4558bf252c2d426ee2e78a2296b7
5 files changed