Commit 17f85da124f957594a3876e6cb149705423d755e partial rollback