Revert lost changes
Revert more lost changes
Revert more lost changes