Revert "Handle expiry correctly in json response"

This reverts commit 778494f9ec3c734f3f2cd15b34cce71aa1d0eeeb.