I would have add a TODO to remember to remove this trick once the PR I mentioned on Gitter is merged.