Revert "improve the behavior of extending access tokens."

This reverts commit 5633bcfb35592522e7915e124efdcd94c3a6ceb6.