Changes Eos handling back to how it worked back in 1.6.4.