Make the linux branch a bit more standalone.