Just getting this absolute mess upstream