Reverted more stuff