We may be able to remove this after #543 is resolved.