This will ensure consistency. We should try doing this after #2523 and use the same config as upstream.