Bug 963215 second commit (no doc)