Revert to old ComEgg