Don't bother with a 'userinstallation' subdirectory. It is a
subdirectory called "user" of the UserInstallation value that will be
used for our stuff anyway.

Change-Id: Idb6b5992bfda73ed7af80274b0de8ad7b43c241c