Revert to fix bugs
Don't break the updater
Untested importing stuffs