Reversion to old prototype