Remove _previousId prop to match master implementation