Drop the ‘awful hackery’ that no longer seems needed (I can reproduce the failure with .19, not with .21).