Reverted more changes