Working on #2362.