Temporary work for bug #8031.