[svn merge] Changeset 51650 - Revert and reapply badnull patch