DO NOT COMMIT, copied from dirty checkout