rollback to second attempt to fix issue #7