revert b8b2126dbfb1d0cf5c771baf23a29e1130a70fba
This is a "fix" for the same problem, but it relies on the ordering of screens. The approach to pick output by names if there are identical outputs avoids this.