Revert to (mostly identical) original version