Get Calypso data working again [1790]