\comment macro conflict between changes and amsmath

I just upgraded from Ubuntu 18.10 to 19.04, and a document that uses amsmath and changes start triggering this error in xelatex:

! LaTeX Error: Command \comment already defined.
               Or name \end... illegal, see p.192 of the manual.

I'm not sure whether an update to amsmath or changes is the actual culprit, but they both define a \comment macro, and that is now causing problems.

My workaround since I don't actually need amsmath's comment macro (nor changes) is:

\let\comment\undefined
\usepackage{changes}

Since amsmath is so widely used, it would be nice to find a clean resolution to this conflict. In the meantime, the workaround is fine for my needs.