Revert "resend pr for bug 948826"

This reverts commit 0214caef6fd00eb5ae5f439d911766ba4c15ed2d.