Reverting further obsolete changes