Fixing Eric's destructive commits