Switch from monkey patch to delegate to see if we can get super.perform() back.