Remove stuff to do with local-username.
Merge bug25985