Revert "Allows an expiration date without using a refresh token"

This reverts commit 2c39adb038d4f6592a9f5249ebf0aad035dab176.