[AC pgg] Revert Aidan's last commit to fix smoketest