Alternate (probably more correct) fix for #3182 (supercedes #3183) (#3185)
Alternate (probably more correct) fix for #3182 (supercedes #3183) (#3185)

Co-authored-by: Dillon Stadther <65c0be61cc79b1f9740e20637e424e2127e70d95@gmail.com>
spotify/luigi,riga/luigi,riga/luigi,riga/luigi,dlstadther/luigi,dlstadther/luigi,spotify/luigi,riga/luigi,dlstadther/luigi,dlstadther/luigi,spotify/luigi,spotify/luigi