Temporary work-around for bug 162