@alexcrichton you misread this XXX, yeah? Does the "remove the XXX statement still apply?