Blocks due to bug 901931