Bug 920752 - Make origin more flexible to fix browser case