Let's try reverting these to see if they persist now that I actually know how to build on Linux.