stuff
Re-add disabled patch, todo: merge patches 24 and 25