This reverts commit 1fc1f467a0. (Revert note: the fix here is messy and incorrect. Roll the code back to a cleaner slate to help smoothen the merge with the pending GZDoom 4.14 update, THEN later figure out how to fix this properly)
1fc1f467a0