bug 36601 is fixed upstream