Revert "Modified closure"

This reverts commit ccee3c3bd99fa78a174925353bec3e1d5b97e173.