TEMP: commeomment EOS code

* need to re-visit and correctly implement this code!

Change-Id: I7e67b1b2b913d14a1d50e2f3ee13e3df80e95ee4