Revert "Fix problem with domain name"

This reverts commit e0be1c7372d32d687d32de3ea23967be261b8bec.

Change-Id: Ic81f85924cd876eed846706f86573cd26eee5b2d
Merge "Revert "Fix problem with domain name""