Update according to ticket #10403.

Someone more familiar with this formatting please verify my changes :)