Rolled-back some stuff I overwrote.