Revert some fixes