Make an effort to adhere the spec 7.6.3.2

Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=792816