Rewrite 18859 changes file from user POV.