Bug 863331 - Fixing Bug 857574 uplift