Port patch over to retroplayer