* remove (some) hackery from features line split issue