Reverted more bad changes