Removes the code with the manual user addresses fix.

Cleans up code as agreed in #3347.