Working toward R3.2.11 compat.