Hack to work around bug 858225