Support agents < 2.1.0, partially revert c1e0380