Revert "Add installer persistence [2/3]"

This reverts commit 9a6b724b2ecb4d75384b04183272b64411264621.

Change-Id: I7551fd97ffef2005606707f189b97e16d37e01d3