Upstream fixed the crash by adding a missing return statement, so update to using that patch instead of reverting the original change.
Adam Williamson