re-apply modifications rollback by error (see original commit 0635213)