Revert that stuff i merged from master