Fix non-TUX workflow selector

Ib0f874af fixed the TUX one, but broke non-TUX and cleaning up
unused code was left halfway.

Bug: 47016
Change-Id: Ice376e99dbb978c3e50c50cf428f5f357795a36d
Merge "Fix non-TUX workflow selector"