Superseeded by #48908. Closing.