Why is this mixed in this PR? Is it tracked by a bug?