MDL-22609 undoing directory variables magic from last commit, keeping just the userid...