Ack.. Reverts some stuff that changed with the infinite loop.