Let's make it a separate issue, so that this PR doesn't get too stale.