Follow up to bug3093 patch