Revert some unintended changes