Waffle the opt-out (bug 1072637)

Yep. I looked and didn't see that it was already that way so I stuck it on the end.