[PATCH] final change for Bug 714790