Use compressed values per comments on #1883