Revert "Properly protect cell location." am: 602b29662c  -s ours
am: 6b39e08c6b

Change-Id: I2b908e751f97237d0606c58bcf2bb10dc4fc79a0