rollback part of the fix