Bug 901444

Fixing bad merge