Rolled back some changes to see if this helps the build server