WL-3318

Revert Preferences -> Profile so that it can be a single commit