reverting some code, testing on linux