same comment that for the ESD, this should be bug 971557.