Bug 657595

Re-submitting pull request.