Use internal Loader properties.
Merge pull request #974 from tobeytailor/timeline

Fixes regression in #968