Reversed a bunch of eager changes to get stuff working again