partial reversion to reverse introduced bugs