Replaced usage of RestorableModel_TO_BE_OBSOLETED with usage of
RestorableModel.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>