Revert "Testing faster expiration"

This reverts commit 7ddb7ecc8551fbfd54506b9d95281d178f9a2e23.