Merge two versions of SysDep, ugh