Bug 902181 - Should wrap domain input element where possible