Revert "ARG"

This reverts commit f573fdae1603238ef1a8eade8f548e0382a31363, reversing
changes made to 954aa30d7b41f3bb7e4284803bc66a5faf9b6e42.