Revert AutoMOD "updates" and remove conflict remnant.