reverse everything since master to figure out weird clang issue