Created by: mrnugget
Left-over from #35374 that I just ran into. Apparently I didn't undo the changes I made in that PR completely and ended up in a half-state.