#3845: Compensate for bug in FAPI.