Revert 45bc012..1fed890

This rolls back to commit 45bc012154e5dbe5645d3255d5674fdf98e4ac71.
Revert 1fed890..97fa372

This rolls back to commit 1fed89012d92b9424e41c1314ea44998f32fa3f9.
cg