Will be needed to support other time-dependent content, such as conditional tags. (cherry picked from commit 2f71c5c4)