I don't have time to run regtests on the proposed patch, so my apologies if
it doesn't work. Both of the problematic files make it thru to compilation
with this fix, although I have no clue how/why it does what it does and if
there is a better/safer/smarter way to do it.