Restore changes from Qi