Remove a few WITHOUT statements for things that we actually probably need. Hopefully fixes build weirdness.