revert poor onboarding UX change

Created by: slimsag

in v3.36 we shipped a new TOS consent UX, but we had some internal miscommunication on this onboarding flow and it didn’t turn out the way we intended. This issue is for tracking reverting of it.

For details, see: https://docs.google.com/document/d/1yz_YkUrrS6p6QMeSbuLVmosYJjjXLKCJ8kU2C5tCBAM/edit#heading=h.i1x4jfomy172