This should probably be re-introduced, so that you mess with the diff as little as possible.

Sorry :/