Safer time axis detection. Also reverted changes in commit a3793f6, which should no longer be required.