Less ambitious change to how current_model works