Back out fix that didn't fix