Revert use rememberToken() because not possible to chain the return value at the moment.

Signed-off-by: crynobone <crynobone@gmail.com>