Obsolete changes :(

You might want to add some of these changes, although it would have to done manually since our repositories have diverged a tad too much.