Finished #2920.