Trying reverting half of previous change to see if that helps.