Fix up the Linux branch to actually work.