Revert few accidental changes