Revert "Properly protect cell location." This reverts commit d9cc11475bf9033090db4476a589459e1576a130. bug:38489777 Change-Id: Ib34bfa095fe0ace0deded3ded0ee92d5713147f2