Reverted some more old changes