Fix issue with duplicate emails.

Don't call ship! twice. Just once...

Change-Id: Ibcffc06a4ddf69ebc72810cd6afdf8250b550ab0