Revert "introduce new argument to atoid(_picky) which indicates what kinds of ID"

I had to do this as this commit breaks core functionality.  MCR will have to try again.

This reverts commit bf3428f60b17478e13e8df3dc6c5829bff65d52e.