bug 36810 is fixed upstream