Roll back copy changes brought over from mariokart branch