I should be able to remove this when #1960 is merged.