- Clean up broken aliases caused by registry bug #4894. (#4909)