This removes some duplicate code that recreated the identical workaround
when the newer signal API is missing.