Revert [14683]