Try to get builder tests to run/pass setting back to how it was.