Moved back to a (simpler) non-temporal schema.