Revert some earlier changes