I'm for solving that separately as part of #585.