Merge "Mostly drop old pre-actor user schemas"