Revert to using default date emitter

This was a regression of a previous change due to merges somehow...