Bug 836772 - Follow-up fix