Removed old MODEL() implementation and switched to new version even during bootstrapping.