removing workaround for bug 2414
Merge branch 'master' into avaneesh