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

Change-Id: I881ad99797729be3fdc746244c2b6e8246bcedd3