no more funny businesss (bug 1066603)