back out a bugfix that was not fully working