rollback [Fixes #82570704]