Make consistent with sync-taken-out version