Back out a workaround.