Don't use munged nick anymore
Fix temp-patch