Revert submission 21609950-u-profiles-v7

BUG: 271469319
Reason for revert: Possible regression for startup time, will merge a better candidate later

Reverted changes: /q/submissionid:21609950-u-profiles-v7

Change-Id: I73d5b3f45ae4bb082e9312ad47c32f5e21fa073c