Revert "Fix backup for users hit by erroneous backup disabling" am: 9f61d17e6a
am: 98a145b5af

Change-Id: I82ae89b2b0ebb5fefd44fec4f10184b6bb7123d3