From Psychiatric Patient to Citizen Revisited