Revert "Tardis"
Merge pull request #2 from janesternbach/revert-1-tardis

Revert "Tardis"