Finished #3924

Then let's keep it as it is. :)