Reverted some accidental deletions