Proper way to fix case preservation issues from Bug: 12006.