Sync with -current (again)