timestamp is unused and removed after cleanup in commit 3574c524, this fixes this in the missed parts Part-of: <!3253>