[V21.5] Unbreak w3.el for 21.5.