Fixed a nasty layering violation in the edis source