Trying again to fix the broken 1.9.3 compile.