Correct the preprocessor condition introduced in r20112, also include FS#9958 by...