Reverted change to block token to reduce upgrade issues.