Reverting a botched bug fix