List the user modules explicitly, and we can get rid of the support for the user tag!

Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
2 files changed