Reverted some lost changes