rollback closure change to support java 7