Bug 836772 - Another follow-up fix