Revert "with statement"

This reverts commit fd29680f0b60ebfd17ccb751235fa152a0b3295e.