need the version that allows NULL for a while still

Change-Id: Ie7c61ad75b60bb2900a843df7fb12add03a20bf2