Back out fix for RT11913, we don't need this.