Revert "Also prevent agent argline overwriting"

This reverts commit a64a3409c2c02083c65400384543bc8316a3b2ec.
Revert "Give this a try"

This reverts commit 653b9ec7195973ef8143cdec93ca83dcb0377f22.