Revert all annotation changes for environment variables and command line arguments. See commit 41013a01.