Transitional additions to fix the check for re-materialization requirements