Re-commit 65975 and a fix for the problem that