Revert some mekanism changes and update EP3