CHANGE: remove object registration check.