[analyzer] Address Jordan's code review of r175857.
Revert "Add more attributes from the command line to functions."

This reverts commit 176009.

The commit is a likely cause of several buildbot failures.