Bumping some depedencies with minor code changes is the only thing needed to make this happen. See #1950