Reverted use of ctx.state for now