This is a followup to #136512, because I don't know how to merge patches. They're supposed to go together.
Created attachment 105526 [details] part2
Merging with 136512 *** This bug has been marked as a duplicate of 136512 ***