I've opened #3745 for this so we don't have to hold this PR up.