Fixed due to Bug 996053