Scrap 1.8.x