Roll back to the old goalkeeping system