I was using the wrong date in datedir this whole time!
Merged with master