Revert "Properly protect cell location." am: 602b29662c  -s ours am: 1b1bf8dd22
am: 1a5be0115d

Change-Id: I64754d724c92e55a6b1494043a19815b5f59fd37