backed out inproper bug fix