Moving to compiling less ourselves so we can override easily