Bug 1006009 Commit Version 2