Finished #3924

This line looks rather short now.